Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Добавлены новые виды вредной еды #154

Merged
merged 7 commits into from
Jul 31, 2024
Merged

Добавлены новые виды вредной еды #154

merged 7 commits into from
Jul 31, 2024

Conversation

Schrodinger71
Copy link
Collaborator

@Schrodinger71 Schrodinger71 commented Jul 30, 2024 •
edited by 1Stepka1
Loading

Описание PR

Перенос AdventureTimeSS14/space_station#335

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Jul 30, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 30, 2024 •
edited
Loading

RSI Diff Bot; head commit cb70e7c merging into 32f8595
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Objects/Consumable/Drinks/nostop.rsi

State Old New Status
icon-open Added
icon Added

Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi

State Old New Status
onion-and-sourcream Added
shrimp Added
space Added
spicy Added

Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi

State Old New Status
onion-and-sourcream-trash Added
shrimp-trash Added
space-trash Added
spicy-trash Added

Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/meat.rsi

State Old New Status
beef Added
chicken Added
horse Added
pig Added

Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/trash.rsi

State Old New Status
beef-trash Added
chicken-trash Added
horse-trash Added
pig-trash Added

Edit: diff updated after cb70e7c

@Schrodinger71
Rename Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/cans.ftl …
1ab1d62 
…to Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.ftl
@Schrodinger71
Merge branch 'master' into food_fuck
f126513
@Schrodinger71
Rename Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/snacks.ftl …
5f1f536 
…to Resources/Locale/ru-RU/ADT/Entities/Objects/Consumable/Food/snacks.ftl
@Schrodinger71
Rename Resources/Locale/ru-RU/ADT/Entities/Objects/Consumable/Food/sn…
26b497a 
…acks.ftl to Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl
@Schrodinger71
Rename cans.yml to drinks_cans.yml
cb70e7c
@Schrodinger71 Schrodinger71 requested a review from 1Stepka1 July 31, 2024 08:05
1Stepka1
1Stepka1 requested changes Jul 31, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice cock

@github-actions github-actions bot added Status: Awaiting Changes Ожидание изменений and removed Status: Needs Review labels Jul 31, 2024
@github-actions github-actions bot removed the Status: Awaiting Changes Ожидание изменений label Jul 31, 2024
@Schrodinger71 Schrodinger71 added this pull request to the merge queue Jul 31, 2024
Merged via the queue into master with commit 8c6b232 Jul 31, 2024
18 checks passed
@Schrodinger71 Schrodinger71 deleted the food_fuck branch July 31, 2024 09:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1Stepka1 1Stepka1 1Stepka1 approved these changes

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C#
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Schrodinger71 @1Stepka1